Skip to content

feat(target): run the EESSI target through eb-local - #34

Merged
HaoZeke merged 9 commits into
mainfrom
fix/use-eb-local-eessi
Nov 16, 2026
Merged

HaoZeke merged 9 commits into
mainfrom
fix/use-eb-local-eessi

Conversation

@HaoZeke

@HaoZeke HaoZeke commented Nov 16, 2026

Copy link
Copy Markdown
Collaborator

Stacked on #26 for the towncrier setup. Replaces #27.

The EESSI target runs eb-local with EB_LOCAL_EESSI_EXTEND=1, and scripts/eessi-extend-eb.sh is removed.

  • The eessi-extend-eb integration is replaced by eb-local's eb command. The container bind-mounts the eb-local binary the operator installed. A present empty EESSI_*_INSTALL still counts as that mode, which eb-local enforces.

public_eessi_extend_target_routes_through_eessi_container loads the example target and checks the command is eb-local, EB_LOCAL_EESSI_EXTEND=1 is set, and eessi-extend-eb.sh is absent. The example target uses EESSI 2026.06 and names EESSI_CVMFS_INSTALL among the modes. The howto, target reference, skill and llms-full text match that. The commit has a towncrier fragment.

@HaoZeke
HaoZeke changed the base branch from fix/towncrier to main November 16, 2026 04:52
The eessi target execs eb-local with EB_LOCAL_EESSI_EXTEND=1.
scripts/eessi-extend-eb.sh is removed, and with it
tests/eessi_extend_eb_script.rs, which ran the script, and its CI entry.
eb-stack does not build eb-local; the container bind-mounts the binary
the operator installed.
The Cargo prelude reads the host triple only when rustc -vV succeeds,
but it opened that step with `_triple="";`. The semicolon ended the &&
chain, so when an earlier step of the prelude failed, EasyBuild's
install command still ran. The step is now `_triple= && if ...; fi`,
and the prelude stays one && chain.

The doc comment says where the compat layer comes from: EESSI_EPREFIX,
else EESSI_CVMFS_REPO and EESSI_VERSION, default 2026.06.

A unit test runs the prelude under pipefail with a rustc that exits
127, once with EESSI_EPREFIX and once with only EESSI_CVMFS_REPO.
eb-local 2.4.0 has no extend mode. Asked for --version, it prints its
own version and exits 0, so target doctor passed an EESSI target that
cannot build: outside a Slurm job its builds stop with "not inside a
Slurm job".

When the target environment turns EB_LOCAL_EESSI_EXTEND on, read as
eb-local reads it (set, not empty, not 0), the EasyBuild probe now also
needs the "This is EasyBuild" line that only eb prints. Without it the
check fails, and a new reason field says that eb-local before 2.5.0 has
no extend mode. Other targets are judged by exit status alone, as
before.

reason is left out when there is none, so the JSON of a passing check
is unchanged and a stored report without the field still reads.
The EESSI target needs eb-local 2.5.0 or later, the first release with
EB_LOCAL_EESSI_EXTEND. The target reference and
examples/targets/eessi-extend.toml now say so, and that 2.4.0 and older
ignore the variable and answer --version themselves, which target
doctor fails.
…eessi

When none of the four install variables was set, the removed
scripts/eessi-extend-eb.sh exported EESSI_USER_INSTALL=$HOME/EESSI and
created it. eb-local exports nothing in that case, so EESSI-extend
installs under its own default, $HOME/eessi. The removal entry now says
so, and that setting EESSI_USER_INSTALL in the target environment keeps
the old prefix.
The rebased #31, "fix(cargo): quote CC and LIBRARY_PATH in the EESSI
prelude", on main.
The rebased #34, "feat(target): run the EESSI target through eb-local",
on top of #31.

The Cargo prelude in src/cargo.rs keeps both: #31's CC default, quoted
LINKER, filtered triple and quoted eval, inside #34's chained triple read
(`_triple= && if ...; fi &&`). The inline comment that cited
scripts/eessi-extend-eb.sh goes, as in #34, which deletes that script and
moves the best-effort note to the function's doc comment.
@HaoZeke
HaoZeke force-pushed the fix/use-eb-local-eessi branch from 3d8bda3 to 9eb4ab0 Compare November 16, 2026 07:13
HaoZeke added a commit that referenced this pull request Nov 16, 2026
The rebased #40, "fix(gap): choose the bump source by toolchain family and
generation", on top of #31 and #34.
@HaoZeke
HaoZeke merged commit 6551ae9 into main Nov 16, 2026
22 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant